Notification: fix regression in notification image handling

We must set the image after calling .update(), because we're passing
clear: true and thus we're removing the image too.
Also, we need to specify an explicit icon size, or St.Icon will use
the default (48px)

https://bugzilla.gnome.org/show_bug.cgi?id=692091

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index f23b268b31feedd5f2e76ff4ab2e4e58d9b08099..fa1d7157b97607d3c1b2f1ab46d3b005a4f1907b 100644 (file)
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -395,17 +395,17 @@ const NotificationDaemon = new Lang.Class({
         // one of 'image-data' or 'image-path' are specified, we show both an icon and
         // a large image.
         if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage });
+            image = new St.Icon({ gicon: gimage,
+                                  icon_size: notification.IMAGE_SIZE });
         else if (!gicon && gimage)
             gicon = gimage;
         else if (!gicon)
             gicon = this._fallbackIconForNotificationData(hints);
 
-        notification.setImage(image);
-
         notification.update(summary, body, { gicon: gicon,
                                              bannerMarkup: true,
                                              clear: true });
+        notification.setImage(image);
 
         if (actions.length) {
             notification.setUseActionIcons(hints['action-icons'] == true);